Use g_assert_cmpint instead of g_assert in check_level_length()
authorKristian Rietveld <kris@gtk.org>
Sat, 14 May 2011 12:45:54 +0000 (14:45 +0200)
committerKristian Rietveld <kris@gtk.org>
Mon, 22 Aug 2011 19:30:30 +0000 (21:30 +0200)
gtk/tests/filtermodel.c

index 6d12cf21bb61e8dc8b38b84f87d77e57c4e054d3..88fe1233970818db67aa2711b3d24de1dcfdd346 100644 (file)
@@ -787,24 +787,26 @@ check_filter_model_with_root (FilterTest  *fixture,
 static void
 check_level_length (GtkTreeModelFilter *filter,
                     const gchar        *level,
-                    const int           length)
+                    const int           expected_length)
 {
   if (!level)
     {
-      int l = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (filter), NULL);
-      g_return_if_fail (l == length);
+      int model_length;
+
+      model_length = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (filter), NULL);
+      g_assert_cmpint (model_length, ==, expected_length);
     }
   else
     {
-      int l;
+      int model_length;
       gboolean retrieved_iter = FALSE;
       GtkTreeIter iter;
 
       retrieved_iter = gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (filter),
                                                             &iter, level);
       g_return_if_fail (retrieved_iter);
-      l = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (filter), &iter);
-      g_return_if_fail (l == length);
+      model_length = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (filter), &iter);
+      g_assert_cmpint (model_length, ==, expected_length);
     }
 }